Adding SKIP() to tests that aren't supported for VMX domains.

Signed-off-by: Dan Stekloff <dsteklof@us.ibm.com>

diff --git a/tools/xm-test/tests/block-create/01_block_attach_device_pos.py b/tools/xm-test/tests/block-create/01_block_attach_device_pos.py
index 1ea9bde00b7a99571e4dd96b4f3d60c2639c10c7..5c2febdad4655a4382f01380e98b2adfbb14683d 100644 (file)
--- a/tools/xm-test/tests/block-create/01_block_attach_device_pos.py
+++ b/tools/xm-test/tests/block-create/01_block_attach_device_pos.py
@@ -9,6 +9,8 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()

diff --git a/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py b/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py
index 1d8323d7f07bc135cb2c2c1c027ec14bdabb9e85..36d64cc56e8b3f61b2f389fbc0c19f90943bb5b2 100644 (file)
--- a/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py
+++ b/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py
@@ -9,6 +9,8 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()

diff --git a/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py b/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py
index 63a79965af1258acace876ca6cf4e022f7a5856c..d392c60427e34eb3e5f8726d37ae257f8d440941 100644 (file)
--- a/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py
+++ b/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py
@@ -9,6 +9,8 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()

diff --git a/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py b/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py
index 47c808adb9afceb6840847d5aad77646c3232033..06cc1169743b0e79c4b723681607223145aef3e1 100644 (file)
--- a/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py
+++ b/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py
@@ -9,6 +9,8 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()

diff --git a/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py b/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py
index 856b7c0f57071a67edf11c9ccf7944b08dfbdd47..bd28bc18be1d76110c62fe10d4f802ad9ff44d1a 100644 (file)
--- a/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py
+++ b/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py
@@ -5,6 +5,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
+
 status, output = traceCommand("xm block-attach NOT-EXIST phy:ram1 sdb1 w")
 
 eyecatcher = "Error"

diff --git a/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py b/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py
index 0d388a5baced0be78d6d4c7dae124c2e24531eeb..8c08658068f9dba8afc671887e9361bda624f03d 100644 (file)
--- a/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py
+++ b/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py
@@ -9,6 +9,8 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()

diff --git a/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py b/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py
index 2420fec3ba2d2d153d4daa590a3f91d3d3747ba2..e34f5c8ebdee366b5ee97e1780684804fb5276f5 100644 (file)
--- a/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py
+++ b/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py
@@ -9,6 +9,8 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()

diff --git a/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py b/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py
index 0d782dd4c286725450d2f4ffe92164b79dcb37a3..60b12da70e9b6ddf1045f8cf2d298c6fa47500df 100644 (file)
--- a/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py
+++ b/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py
@@ -9,6 +9,8 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()

diff --git a/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py b/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py
index f32b6bee3030f96a861398785e8baf62f6218254..42fe9e5ebe7fea7cea33cacc5d0e2a092bb07263 100644 (file)
--- a/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py
+++ b/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py
@@ -46,6 +46,9 @@ def dettach(devname):
 
     return 0, None
        
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
+
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
 

diff --git a/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py b/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py
index 4f897c3ead6159b0d41ce8043c818f300cebe49c..adf7ca5ea5d2e4a598ce328c5b2523e0a6f22b71 100644 (file)
--- a/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py
+++ b/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py
@@ -5,6 +5,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
+
 # Mount /dev/ram0
 
 s, o = traceCommand("mkfs /dev/ram0")

diff --git a/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py b/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py
index c93077fb4ecf5e661e4d2ab3995f91d6dc0420aa..c0ce5bee8a6eb9bcc4259654ac02d120651c2f31 100644 (file)
--- a/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py
+++ b/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py
@@ -5,6 +5,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
+
 config = {"disk":"phy:/dev/ram0,hda1,w"}
 
 dom1 = XmTestDomain(extraConfig=config)

diff --git a/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py b/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py
index aa456cbdf2c46f7aee3194286876667a975cf691..8f7086388ced069cb25aaf4ba222baca4928fbd0 100644 (file)
--- a/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py
+++ b/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py
@@ -5,6 +5,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-detach not supported for VMX domains")
+
 config = {"disk":"phy:/dev/ram0,hda1,w"}
 domain = XmTestDomain(extraConfig=config)
 

diff --git a/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py b/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py
index a56f985a8a4b8a20b5a6cec36ea3b08699cb4c73..6c87db819851dcf56631a4890dad294c7bfcc957 100644 (file)
--- a/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py
+++ b/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py
@@ -5,6 +5,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-detach not supported for VMX domains")
+
 domain = XmTestDomain()
 
 try:

diff --git a/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py b/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py
index db6c30559263f16c7709a00eb20a23b4bdf43a6d..4f1e4858005d24965095ab9cdb7f5dc46e91a212 100644 (file)
--- a/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py
+++ b/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py
@@ -7,6 +7,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-detach not supported for VMX domains")
+
 domain = XmTestDomain()
                                                                                                        
 try:

diff --git a/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py b/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py
index 78e84af1e74b18d1e1816ae20e62e7bf02b0146e..2a0993f2a533842d93bd01abac5d2ee821329533 100644 (file)
--- a/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py
+++ b/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py
@@ -5,6 +5,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-detach not supported for VMX domains")
+
 config = {"disk":"phy:/dev/ram0,hda1,w"}
 domain = XmTestDomain(extraConfig=config)
 

diff --git a/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py b/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py
index 4f0ff644795d394ca54fbc028463c0bee0ebd7b5..bc41be984e6577325187f08ee473910b2c063d97 100644 (file)
--- a/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py
+++ b/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py
@@ -26,6 +26,9 @@ def checkXmLongList(domain):
     else:
         return False
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-detach not supported for VMX domains")
+
 domain = XmTestDomain()
 
 try:

diff --git a/tools/xm-test/tests/block-list/01_block-list_pos.py b/tools/xm-test/tests/block-list/01_block-list_pos.py
index dbe7415547efed05b8ea1d820f337219fdbd4146..185eb66dc2d61a337a300f30c34aa016df2ec8d4 100644 (file)
--- a/tools/xm-test/tests/block-list/01_block-list_pos.py
+++ b/tools/xm-test/tests/block-list/01_block-list_pos.py
@@ -8,6 +8,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-list not supported for VMX domains")
+
 config = {"disk":"phy:/dev/ram0,hda1,w"}
 domain = XmTestDomain(extraConfig=config)
 

diff --git a/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py b/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py
index 410dc8f23f9b36e9817d2ed8cd247cd71609a40e..27e56e5083bd7be06f86dbd84150a425b5691764 100644 (file)
--- a/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py
+++ b/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py
@@ -8,6 +8,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-list not supported for VMX domains")
+
 domain = XmTestDomain()
                                                                                               
 try:

diff --git a/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py b/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py
index 442dd901133d2c349165432e1a3f0878cf5a5208..f873d87025c8e19c52c58bf25b78229bfaae109e 100644 (file)
--- a/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py
+++ b/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py
@@ -8,6 +8,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-list not supported for VMX domains")
+
 config = {"disk":"phy:/dev/ram0,hda1,w"}
 domain = XmTestDomain(extraConfig=config)
 

diff --git a/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py b/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py
index 4c2ce2a9efe8215cc4d9b586ada4c646f78e1cc8..7ff1a2ddf7b4103d2b0af1f370d1cbff29d9a1fa 100644 (file)
--- a/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py
+++ b/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py
@@ -8,6 +8,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-list not supported for VMX domains")
+
 domain = XmTestDomain()
 
 try:
@@ -21,8 +24,5 @@ status, output = traceCommand("xm block-list %s" % domain.getId())
 if status != 0:
     FAIL("xm block-list returned bad status, expected 0, status is %i" % status)
 
-if ENABLE_VMX_SUPPORT:
-    SKIP("Using block device for root, so this case does not apply")
-
 if output != "":
     FAIL("xm block-list should not list anything for domain with no block devices")

diff --git a/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py b/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py
index ccaf0d72cc8b4ba3983f09e07fc580b0d323db69..e3422626598a8bd739e31df6e9800de59dbcce1f 100644 (file)
--- a/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py
+++ b/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py
@@ -5,6 +5,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-list not supported for VMX domains")
+
 domain = XmTestDomain()
 
 try:

diff --git a/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py b/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py
index b8f2a2823451a5e2ebb33e13bd543ad359edf441..e13fca84157c40c607d5120861a06b55968d9839 100644 (file)
--- a/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py
+++ b/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py
@@ -8,6 +8,8 @@ import re
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Mem-max not supported for VMX domains")
 
 status, output = traceCommand("xm mem-max")
 eyecatcher = "Error:"

diff --git a/tools/xm-test/tests/memset/01_memset_basic_pos.py b/tools/xm-test/tests/memset/01_memset_basic_pos.py
index a5744704b01137a7a4b6c038b705625d445f3630..5ed6406e8d8ed1b471b194320dc67c8e50d7a23c 100644 (file)
--- a/tools/xm-test/tests/memset/01_memset_basic_pos.py
+++ b/tools/xm-test/tests/memset/01_memset_basic_pos.py
@@ -20,6 +20,9 @@ import re
 import time 
 from XmTestLib import * 
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Mem-set not supported for VMX domains")
+
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain() 
 

diff --git a/tools/xm-test/tests/memset/02_memset_badparm_neg.py b/tools/xm-test/tests/memset/02_memset_badparm_neg.py
index 07f7e2c635f632aba12ae744c7caf5e5732a696e..a2f60c86d28ea535d6796540e0e210b76b2c332e 100644 (file)
--- a/tools/xm-test/tests/memset/02_memset_badparm_neg.py
+++ b/tools/xm-test/tests/memset/02_memset_badparm_neg.py
@@ -18,6 +18,9 @@ import re
 
 from XmTestLib import * 
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Mem-set not supported for VMX domains")
+
 # destroy no parm input - negative test
 status, output = traceCommand("xm mem-set")
 eyecatcher = "Error:"

diff --git a/tools/xm-test/tests/memset/03_memset_random_pos.py b/tools/xm-test/tests/memset/03_memset_random_pos.py
index 1f5c0337105b88c6617226145362dbec88ea9b5f..c4f3c47370cb677d37c4fbd388c3670a25e2de88 100644 (file)
--- a/tools/xm-test/tests/memset/03_memset_random_pos.py
+++ b/tools/xm-test/tests/memset/03_memset_random_pos.py
@@ -8,6 +8,8 @@ import re
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Mem-set not supported for VMX domains")
 
 domain = XmTestDomain()
 

diff --git a/tools/xm-test/tests/memset/04_memset_smallmem_pos.py b/tools/xm-test/tests/memset/04_memset_smallmem_pos.py
index 11816d14ba9a28a67044007accee470a67deaded..d06571bd05f11902d1925c67dcdb9944035ec5f2 100644 (file)
--- a/tools/xm-test/tests/memset/04_memset_smallmem_pos.py
+++ b/tools/xm-test/tests/memset/04_memset_smallmem_pos.py
@@ -5,6 +5,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Mem-set not supported for VMX domains")
+
 domain = XmTestDomain()
 
 try:

diff --git a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py
index 4895e9c7191dc87125a490e145825b908a4157ba..8f86bdd128b2e467e36b1b0a782443f2befed072 100644 (file)
--- a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py
+++ b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py
@@ -17,6 +17,9 @@ import commands
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Migrate currently not supported for VMX domains")
+
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
 

diff --git a/tools/xm-test/tests/network-attach/01_network_attach_pos.py b/tools/xm-test/tests/network-attach/01_network_attach_pos.py
index b2a491b4e2bdcf59b352ca1a2664f6e4f9471100..eb692ab876555a975eba43a4e29154403ba1b6c6 100644 (file)
--- a/tools/xm-test/tests/network-attach/01_network_attach_pos.py
+++ b/tools/xm-test/tests/network-attach/01_network_attach_pos.py
@@ -8,6 +8,9 @@ import sys
 from XmTestLib import *
 from network_utils import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Network-attach not supported for VMX domains")
+
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
 

diff --git a/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py b/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py
index 7e4559a12ff086f8228b9e3f2fba17f9ab588b52..08563eb239fbbb8193d03a6200256248310c1517 100644 (file)
--- a/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py
+++ b/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py
@@ -10,6 +10,9 @@ import time
 from XmTestLib import *
 from network_utils import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Network-attach not supported for VMX domains")
+
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
 

diff --git a/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py b/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py
index 1b00b32e413c2a87c9c22ee798c54a096c8f624a..d169119d2c98ba7a700b28a1163e34e833a3e481 100644 (file)
--- a/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py
+++ b/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py
@@ -10,6 +10,9 @@ import time
 from XmTestLib import *
 from network_utils import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Network-attach not supported for VMX domains")
+
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
 

diff --git a/tools/xm-test/tests/restore/01_restore_basic_pos.py b/tools/xm-test/tests/restore/01_restore_basic_pos.py
index 82541485250f1f7390280f4a122bfe62f17f0a0b..34c93e8cf849f8bd1bf886671d8139ec77259475 100644 (file)
--- a/tools/xm-test/tests/restore/01_restore_basic_pos.py
+++ b/tools/xm-test/tests/restore/01_restore_basic_pos.py
@@ -12,6 +12,9 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Restore currently not supported for VMX domains")
+
 domain = XmTestDomain()
 
 try:

diff --git a/tools/xm-test/tests/restore/02_restore_badparm_neg.py b/tools/xm-test/tests/restore/02_restore_badparm_neg.py
index aee5b5da7212dcd19b950419b727433b55a23846..c66ed79113f574e034d6c9a800ee1d0b4aff0247 100644 (file)
--- a/tools/xm-test/tests/restore/02_restore_badparm_neg.py
+++ b/tools/xm-test/tests/restore/02_restore_badparm_neg.py
@@ -12,6 +12,9 @@ import re
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Restore currently not supported for VMX domains")
+
 status, output = traceCommand("xm restore -x")
 eyecatcher1 = "Error:"
 eyecatcher2 = "Traceback"

diff --git a/tools/xm-test/tests/restore/03_restore_badfilename_neg.py b/tools/xm-test/tests/restore/03_restore_badfilename_neg.py
index 7639c4b90e05f4a579aac5a1cc9ae341503fc751..ba6e7e2f30924024f2a2cd99e05a64b68b52459e 100644 (file)
--- a/tools/xm-test/tests/restore/03_restore_badfilename_neg.py
+++ b/tools/xm-test/tests/restore/03_restore_badfilename_neg.py
@@ -12,6 +12,9 @@ import re
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Restore currently not supported for VMX domains")
+
 status, output = traceCommand("xm restore /tmp/NON_EXIST")
 eyecatcher1 = "Error:"
 eyecatcher2 = "Traceback"

diff --git a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py
index 61e0b3ed81d4576c28281895af2813abbd15fb6d..74c6145c03f70f5351a10f2540129aec88bb5713 100644 (file)
--- a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py
+++ b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py
@@ -7,6 +7,9 @@ from XmTestLib import *
 
 import re
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Restore currently not supported for VMX domains")
+
 config = {"disk": ["phy:/dev/ram0,hda1,w", "phy:/dev/ram1,hdb2,w"],
           "vif":  ['', '']}
 domain = XmTestDomain(extraConfig=config)

diff --git a/tools/xm-test/tests/save/01_save_basic_pos.py b/tools/xm-test/tests/save/01_save_basic_pos.py
index e76b7e61d71d2153e7fe6b697f2d9a39c3a6b0c8..27e68a5debe05f5511fff1a73df5ee5f7824bb20 100644 (file)
--- a/tools/xm-test/tests/save/01_save_basic_pos.py
+++ b/tools/xm-test/tests/save/01_save_basic_pos.py
@@ -7,6 +7,9 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Save currently not supported for VMX domains")
+
 domain = XmTestDomain()
 
 try:

diff --git a/tools/xm-test/tests/save/02_save_badparm_neg.py b/tools/xm-test/tests/save/02_save_badparm_neg.py
index 7966ff1ee15cedbe224a97cf4f302c2cd7225d04..c50dbe90136fc3eef78d30b237c59fd8add50d8e 100644 (file)
--- a/tools/xm-test/tests/save/02_save_badparm_neg.py
+++ b/tools/xm-test/tests/save/02_save_badparm_neg.py
@@ -12,6 +12,9 @@ import re
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Save currently not supported for VMX domains")
+
 status, output = traceCommand("xm save -x")
 eyecatcher1 = "Error:"
 eyecatcher2 = "Traceback"

diff --git a/tools/xm-test/tests/save/03_save_bogusfile_neg.py b/tools/xm-test/tests/save/03_save_bogusfile_neg.py
index de66e6080f56224db5dd8f8a5af7ee92db74b9ca..0115ee5f3bc332590c00dc91ba0b073660aaff4c 100644 (file)
--- a/tools/xm-test/tests/save/03_save_bogusfile_neg.py
+++ b/tools/xm-test/tests/save/03_save_bogusfile_neg.py
@@ -10,6 +10,9 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Save currently not supported for VMX domains")
+
 domain = XmTestDomain()
 
 try:

diff --git a/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py b/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py
index 00eee82715409d3b90999f2c58e0c70522c35756..9d213e944aed8063d7fab5be23d9f969190c024a 100644 (file)
--- a/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py
+++ b/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py
@@ -9,6 +9,9 @@ import re
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Sysrq not supported for VMX domains")
+
 status, output = traceCommand("xm sysrq does_not_exist s");
 
 if status == 0:

diff --git a/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py b/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py
index 061e7ac006dfca2c80470799f3320be6ede8fab4..0b805fd7b6a9ddfd0ebbdbf1072d6a1c3fa7d6f5 100644 (file)
--- a/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py
+++ b/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py
@@ -9,6 +9,9 @@ import time
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Sysrq not supported for VMX domains")
+
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
 

diff --git a/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py b/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py
index 5eef099a74afa623cc83bb891e6195e47f0dfe93..b69e5617b0878263f34dceca75fec511b4c8ab44 100644 (file)
--- a/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py
+++ b/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py
@@ -7,6 +7,9 @@ from XmTestLib import *
 
 import time
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Sysrq not supported for VMX domains")
+
 domain = XmTestDomain()
 
 try: